(sendmail-pre-abbrev-expand-hook):

If last-command-char is not a character, don't do the expand here.

diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 3ac665259a9a2a493140fb4346467c9e61ba92b8..dcdf3708d60c2db017897c2a2c2bf39c03a9907a 100644 (file)
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -460,7 +460,8 @@ characters which may be a part of the name of a mail-alias.")
             ;; the mail-mode-header-syntax-table.
 
             (set-syntax-table mail-mode-header-syntax-table)
-            (or (eq (char-syntax last-command-char) ?_)
+            (or (not (integerp last-command-char))
+                (eq (char-syntax last-command-char) ?_)
                 (let ((pre-abbrev-expand-hook nil)) ; That's us; don't loop.
                   ;; Use this table so that abbrevs can have hyphens in them.
                   (set-syntax-table mail-abbrev-syntax-table)